Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 17:02:18 +0000 (10:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 17:02:18 +0000 (10:02 -0700)
commit700a31a2817e164ab00c2922b48c1f709d62aedc
tree998ea2cdd83e3b8ab9f8c17afa4f53a182d0028a
parent541215cecc9270dc7fd2d646284193b231658abf
parentde608489c24b2ab5423a09512489b3b52ba96247
Merge from trunk.